Bugfix for config less run