Fix for APPM-81