Bugfix #1240770