Fix DOB issue once and for all