Try to fix issue #68.