Split/add and fixes

If this is only used by the frontend, would it make more sense to do the fix there?