issue 441 fix