Fix the "Feed Pigeon" problem