Fixed #50