modified label and linking issue