The '///@todo' there was for doxygen. Should revert this change