Issue #41 restored deleted code