fixed failing parts