Fixed: custom fields - attempt 2