Temporary hack until we fix the shutdown routine