Complete previous fix (7afd4aac)

There were other places where we had the bug.