fixed a missing operation and resolved an old TODO