yet another stackoverflow fix