fixed returnRowStart and corrected control

Signed-off-by: mienkoja <mienkoja@gmail.com>