User options fix.