Closing Issue #337