Fix for final row