Fixed UI blocking issue