Fix bugs Number 6