fixed switching 1 and 2 error