WiP: fix the preference issue