Tweak return path check