HotFix resolve pending