I guess this could be fine by solving #2976