Issue #3236 - bug fixes.