Fix janice tearing issues