Fix #33 (I think...)