Hopefully fixes bug #139