fixed: bugs.