Fix for #2474 also for blog module which contained similar problem.