make things more robust for long term use