Resolve  bug