More exercise fix