fixes 2 parts