Fix Skip Button Bug