Closing Issue #388