bugfix for feature-bobcat-123