fix for cf9 and missing context