Merge pull request #697 from linquize/atom-bug