changes caused by Singular's commit 4da48545e6aff18df12755894d97db698c7bad8f