Solved row overflow bug