Move the size / parts queries under the commit, seems to have been causing trouble.