Fixing issue APPM-241