Actually resolved #80 this time.