make things more robust