Fix bug4