Graphical artifacts fix