updated for 1.0.12