decorator fix