seems like #436 did not fully solve it, at least it did not work in #450
seems like #436 did not fully solve it, at least it did not work in #450