initial effort for issue #27