Another attempt at issue #6