Fix for versions pre-1.7