Fix for GPT