Obey to reviewer.. code fix