Bug fixing #1