Make it work with first key only supplied