Hot fix for Sap