Bug-fix: actually make last refactor work.