fixed 1 and 2