TODO related to #94