revisit fix for issue #133