Fix for APPM-61