[Fixed] removal of dynamic spawn from a spawn area not being handled
properly

Change-Id: Ia058741bab6854f3af207176213db7723a1adc71