Fix for an Issue #333