fixed 1677