Better fix than previous commit