Fixed Issue #299