Fix for skip bug