taking a stab at supporting something like #523