Add #521 - second attempt

Thanks! Will be done.