Hot fix for alink generator