-bugs fixed