a bit more robust