Fixed closure issue with new user