Fixed #186