fixed first if: