fixed issue 184