Fixed deadloop....