Resolve BUG 90%