Attempt to fix issue #18