Fixed shitty coding