Eremson 1.6 fix part 1