Killed more bugs #80