Attempts to fix things...