Fixed problem that requires building twice.