ping @eLobato on this point