Closing Issue #351