Fix bug-3