added check for enabled actions