Fix #222