Remove that, fix bugs #7
Remove 'that', fix bugs #8