#1 Fixing build order