Revert "Revert "fix incallui""

This reverts commit d331a5a972abf6f50c70a3e6f26cdac17ea9a856.