Fix for APPM-29