make it a bit more robust