fixes #110 #108