[FIX] fixed the endless loop
Merge commit '4fdad57'

* commit '4fdad57':
  [FIX] fixed the endless loop