Fixing build issue