seems to be a safe way to fix things