Fix for APPM-107