Fix gross jimmy code