The previous fixes didn't take into account that system frames can be generated inside the internal pipelines.