initial fix for 1.1