Added argument size check