last change for issue #49