Bugfix #491