fix bug for issue 34