DS-1554 fix again (first fix was wrong)

Thanks, Keiji!