Fix for versions < 5.6