Adding the right fragments parameter
(cherry picked from commit ec8d361)