Bug fix from class website