diff --git a/modules/mol/alg/src/molck.cc b/modules/mol/alg/src/molck.cc
index e1c35083fca0a424e1b05a7eba5973e8d5e7ead3..294e996b97944e04283830bc0b58ebe380a81603 100644
--- a/modules/mol/alg/src/molck.cc
+++ b/modules/mol/alg/src/molck.cc
@@ -10,7 +10,8 @@ using namespace ost::mol;
 
 void ost::mol::alg::MapNonStandardResidues(EntityHandle& ent, CompoundLibPtr lib) {
   // TODO: Maybe it is possible to make it in-place operation
-  EntityHandle new_ent=CreateEntity();  
+  EntityHandle new_ent=CreateEntity();
+  new_ent.SetName(ent.GetName());
   ChainHandleList chains=ent.GetChainList();
   XCSEditor new_edi=new_ent.EditXCS();
   for (ChainHandleList::const_iterator c=chains.begin();c!=chains.end();++c) {