EMI: Fix the brass monkeys

Fixes #987.