fixed issue with multiple keys