fixes to support 1.1.2