Tweak to make this safer.