hacky fix for identity