Comment 4 for bug 363444

Hi,

Here's a fix.

It's not a merge request, as while the test_pack test shows the fix
working, the test_shelf one still fails, and I can't work out why.

Thanks,

James