Follow up to pervious commit