Bugfix
Added condition for parts