FS-640 --comment-only can you see if this patch helps, I think it should really be fixed in sofia but this shold keep it at bay