Fixing build trouble