Fix issue #114 - work for blank envs