bugfix for custom fields ... again