Fix duplicate action problem
Fix duplicate action for real this time