spawn + trader fix?