Temp fix for the fields, will need to troubleshoot further