First commit towards solving issue #124