Fix radio buttons
Merge commit '49d3f22e60bab2d05473a122d4efe55a31beeb57'

* commit '49d3f22e60bab2d05473a122d4efe55a31beeb57':
  Fix radio buttons