fix for APPM-95