Revert "Revert "Fix #19""
Revert "Revert "Fix #19""

This reverts commit fd182aa9d7040a183b2959898447a5f84e7d1177.

FINRAOS/MSL,smartpcr/MSL,smartpcr/MSL,smartpcr/MSL,FINRAOS/MSL,smartpcr/MSL,FINRAOS/MSL,FINRAOS/MSL,FINRAOS/MSL,smartpcr/MSL,FINRAOS/MSL,smartpcr/MSL