Fixed another horrible bug :(