Added correct checks for single product variation