Tweak to check that there aren't additional keys