Bugfix: Singular check failed after refactor