Bugfix #0000193
Bugfix #0000192
Bugfix #0000194