SOLVING BUGS