handle parts correctly, also fixes #33