Minimize bug further to 28 lines (yet more essential)