Fixed more issues with lumping