Should fix issue #103.