Fix for array lengths