Fix no-birthday bug
Merge nish/submit