Fixed #87