Fix for data-callback