before fixing
before fixing 2