Fix single-part bug