Fix issue #139. This time I think it even works.