fixing build time support