fix bug: issue 20