Fix build skipping issue