Found a bug and fixed it - looks like this part is fine, for now.