Bugfix #553