Fix the Maximal bug