Changed variable to be evaluated at use-time not at make-time...