Fix for case where key may not be checked.