More work on solving issue #2