Simpler fix