- Added statement to check if there is next target