update from issue #125