fixed both, i think