Fix from #29