fix Bugs reported by Kristy