Fix limit cases