A solution for issue sylva-projects/sylva-core#4034 needs to be backported to 1.6.x