Issue #196 - change as suggested by Michael