Remove limit fix and leave count fix