bugfix for bobcat-123