Seriously, one more bugfix on decorator