removed zero length check