Corrected issue with atom types
Fixed a bug with ensuring that the atom types are correctly applied to the system if they exist in the original system.
Fixed a bug with ensuring that the atom types are correctly applied to the system if they exist in the original system.