Fix issues 580s