Add #521 - second attempt

Thanks! Should be fine now.