Fix multi-part Closes #107