Lippert frame fix. Part 1