Added todo comment for temporary fix