fixing environment creation after master merge