Fixed #90