made action handler less aggressive