fix for APPM-38