Minor bug fix

(Hopefully) fixes the bug Roland described.
If so, delete the TODO