FIX #1759 while respecting the ticks