Closing Issue #324