Make things more robust