Fix radio / checkbox decorator