Now looks for hex string.
Bugfix: restored v1.2 modifications which were lost.