Added a comment/TODO about some hacky code