Fix exercise handlers