Version which does not crash when compiled with GLEAN. Still has the blip.