Improve bzbug decorator