Fixed support of variables in properties