Workaround for d8