Fixed bug: Wrong Row fetching