Bugfix #732 part 2