Bugfix #748