issue 138 added