added assert support removal