fixing bug: issue 51