ticket:1 removed decorator due to 1.6