Closing Issue #394