Closing Issue #329