Fix for build from scratch