#531 fix