fixed those shitty bugs