Fixing environment events