Fixed an issue with the control type field again