Changed target back to 17 to handle alignment bugs in 18.