Fix #88 (many parts)