Added executingAction variable to prevent circular action calls