This should hopefully fix the draws