Attempt to fix #128