Attempt at fixing Max