May have fixed main frame issue