I should have made this a separate PR, because this is a bug BTW