Fixes #285. fixes parts ordering