Closing Issue #407