Issue #376 - fixed