Nice decorator fix