Data get fix