Added fix to ensure we can add data