Fix bugs
Minor change