fix broken stuff from vitor