Fixing build problem