Forgot to merge size calculation fix when merging