#11 fixed; avoid missing key notices