fixed: same bugs.