Fix length issue