Fixed issue with questions being overriden (properly this time)