Add comments about the temporary fix