Broken, but less broken version