action suspension fix is OK - cleanup

also added some qualifiers...