fix for APPM-87