Made options safe in batching