Resolved some issue