fixed issue 4