Fix Issue #298