Fixed mode changing to use Options, to prevent NPE