Fix for versions like 1.7