Fixed bug with exclude