- fixed #129

Basically, this was broken since commit bb75ce34fdac32ccd67f59c4a7d1db59afebcb5f.