Attempt to fix things