fixing artifacts issue :grimacing: