Fixed bug with demographics and payments