Fixed some corner cases for action_interceptor