Second fix to issue #26