This is fixed as of latest commit