Fixes the issues with the data array events