#441 fix