My previous fix included a broken default part.. now it's working as inteded without any extra stuff.