Fixes compatibility issues with new version