adjustment to new unit pattern key structure

see issue #85