fixed unresolved bugs