Bug fixing round #1