Add #521 - second attempt

Good point!