partial 2 fix