Fix for APPM-143