Fix #38

Hopefully.