Hopefully the fix of #1