Fix/strict variables