fixed misc bug 2