fix issue 16