Make wrap around skip the value instead of trying to calculate it, this works better with restarts