Fix narrowing problem