Added TODO about #240