Fixed Issue #297