Trying to fix things