Fixes for non self rules no having issue defined