bug fixes to v1.2