fixed bugs - Hutchinson