Fix bug3