Fixed "once" setting behavior