fixing bug/issue 32.