Bugfix for picking up DATABASE env variable