Fixed Issue #312