Fixed for type conversion.
Ensuring attributes get type converted properly.