Bug fix for Task Two