Indeed. @vmarquez, is there any way to do it without this change?