Yes, make sure the choke isn't closing on a still-hot engine.
Just to clarify, true vapour lock is when the mechanical fuel pump gets so hot that the fuel 'boils' inside the pump under vacuum and so won't create suction to pull any fuel in to pump. Pouring water on the pump will show if that...