A bit more robust