Fixed problem with identifying same fqn