I agree. Added a TODO.