Fixed visual artifacts