Fix for race conditions during skips, might clean it up a bit more later