Bug fix on wrapper length