Fix bug introduced by singleton key patch.