Fix no length bug