Fixed bug reported by Glenn Meyers