Trying to fix things, not successful