further changes for issue #72