Fix variable assignment after initial testing