Fix - Switch value and text order