Bugfix #396