removed key check