Fix for 1.2 and recent versions