Better way to fix than previous commit