Issue #34: Time to chew bubblegum and patch things