Added option for non-random MAC change, to workaround a bug