[fix] mantis# 5701, Thank you Merlin and your awsome math skills/tools

Change-Id: I0464207d94de1793492acbec88e6a3c1dffc391d