Bugfix resolves bug 3573