Handle race stack condition
V0.1.2