Fixed #188