#552, #125 lint