Add #521 - second attempt