Fixing #755.