Fix Getting funky with functions