save point: partial solution for issue #12