draft implementation for issue #110