Eng 6857

This is for @AdHoc so string compare has to happen so additional check will be of not much use though.