more aggressive fix