Attempt to fix #100 #128