fixing 1
fixing 2