Fixing OnAdded method