Fixed shapes 1 to 2 and 8 to 16.