[Devel-list] Is this patch the correct solution?