Fixed double-press to skip bug