Fixed #60