Fixed #20.