Fix for strict variables support