reviewd fixed done by Yukti