Fix for strict variables