NO CRITIC: emergency bugfix
