fixed bug reported by Nathan
fixed bug reported by Nathan
fixed bug reported by Nathan