Correctly propagate options