Fixed #21.