follow up fix for issue #19