Second fix for issue #26