Remove 'that', fix bugs #8