Second fix for issue #3