Issue #218 and #219 were fixed