Fix for APPM-1