Issue #374 - Bug 2