Now works properly in Editor/Display Templates