moves base fix outside of production only block