bugfix for ticket 574