Add #521 - second attempt

Could you be a little more explicit.