Fixed implementation #217