FIXING BUGS

FIXING BUGS