Ugly hack to fix siblings when model has reference type fields