Fixed #161