PR fixes:variable moved