fixed skip bugs