Add comment to highlight the HACK