nonPanel fix