Minor change to make future implementations easier