Fix for related fields merge