This seems to fix things