better fix for empty actions list issue