Fixing build model