Bugfix #732 part 1