Small change in handling