Runtime WD fix