fixed misc bug 8