Make it more robust