Fix separate variables for dataAvailable