Fixed Issue #218