#9 bugs fixed