Fix bug which problably caused wrong data to be returned.
New version.