Fix for latest beta