fixed issue 386