Swagman bug fix