Fixed questions being overriden