Fixed #148