"fix" shortened mac helper

Now this should resemble more closely a 'real' shortened-mac helper.
Still this is only for validation and testing purposes, hopefully noone
will ever use this.