Urgent bugfix for config less run