customization fixup as per issue #45