Fixing some decorator behavior