Trying desperately to fix things