Preliminary fix for PROV-495