Should fix issue #90.