Fix to work on 0.90.2

Closes #11