Re #14 additional fix.