Made it more explicit that this is done automagically if not provided