Fix #59 additional fix for the variables which might have similar issue