Trying to fix issue #26