Fix #138: use dimensionless instead of count

We'll keep this here until we are sure that we fixed our problems in #138.