Seems like patch in #38 is created incorrectly. Changes suggested in #36 are ...