follow up tweaks for issue #27