Closing Issue #333