Fix tearing issues