Fixed bugs in the no-ligand setup