Should be fixed in the latest commit