Adds a bit of safety