Fixed error of adding entity to spin queue instead of removing after spin has finished