Issue "Daniel" solved