Fix ATOM default value issue