Fixed Issue #318