Better fix for previous commit