Revisit fix for issue #41