Add #521 - second attempt

Oh, possibly you're right.
Btw, why the build is failed ? I'm confused.