Fix high-priority issue