Fix for multienv