Fix empty RawKey bug