Fixed bug number 3