Fix synchonous action handling