One more decorator modification