Simplest fix ever (closes #166)