I think this is finally working at least on my local dev environment