Bug fixing 13:04-16-05