Fixing atom client