Fix Issue #309.