Simpler fix for previous commit