Speaker fix

Closes #41