#15 Bug fixing