We might be missing some logic here, @pspanja ?