Fixed diagnostic issue