fix for APPM-153,APPM-157,APPM-105