Seems like #36 is fixed