BAC-621: make key more complicated