Fixed core logic w/ adding collection check.