addresses Bug #10240