Fix the issues right way