Seems like this should be fixed, in a separate PR