Energy rollover is properly handled now