fixing stuff from the previous commit