Re #1165 - bugfix on previous commit...