More progress towards solving issue #43