Fixed #144