fix 520 issue 24