Fixed array shape agreement. Needs testing, but I am confident.