Data load fix