#50 - Make sure per-file options are preserved