handle action end better