revisited #870, fixed issue of duplicate actions