Bugfix #0000166