moving drac fix to separate file