Bugfix Mantis #0000261