Bug fixing continued...