Fixed issues due to Logical Atom