Bugfix for incorrect assumptions.