fixing stuff that I broken before