Fixed #47