Removed unnecessary key check