[MGN-145] Fixed fixing lag handling