Horrible bug fixed