Fix suggestion for issue #3