@cheung31  Will you review this change and determine whether it's needed in modal? Joao can tell you why he did it.