Fix issue fo atom