Bugfix #0000119