Fix for draws