fix broken stuff from prev commit