fix to support different build environments