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