Fixed #220