#1688 removed length check