even more fixes for example 8