Removed double yield bug