Core/Items: Workaround for #4