Get rid of TODO (see #24)