Fixed issue regarding data distribution