Bugfix #0000168