Fix for new versions