make things a bit more robust