Taking care of another TODO