fixing 2 stage