bug fixes
Minor change