Fixes assertion returned
Merge with gitlab version