Fixing bug where it's adding null to the arrays and we don't like that.