Fixing for pre 1.6 releases