Fixes #3 although it really should be considered temporary since the fix consumes a layer any time there is a change to the env