June 18 users fix