proper tested fix for 1.2