Bugfix - environment identifier