Another attempt at issue #19