add fix and tests for strict_variables