Fix from @jli3238 that fixes #109