Add fix for compability 193 and 187