APOLLO-1521 Fix for unfixed fix
APOLLO-1521 Exchange array was not respecting types