Ths PR is temporary because I cant reproduce the issue locally