Fix build timing issue