Big fix for Max Energy looping