This is a major flaw that breaks the best usecases for zaps… thanks for uncovering this. Any improvement suggestions?