Fixing environment issue