Fix for artifacting