additional bugfix from daniel