partial solution for issue #35