Another bugfix for test environment