Check and fix