Fixed errors on decorator