Fix #21 - Wait for load before removal.