fixing watch issues