Fix issue if