Fixing next override variables