Fix a bug after initial build block