fixed issue 12