Fixed stupid infinite loop...