Real fix for Environment is injected too late :D