Implement suggestion of issue #2