To close issue 7