Closing Issue #332