bugfix for ticket 613