Fix Custom Fields Issue