Fix Dan's Law