fix for APPM-33