Fix bugs Number 7