fix issue 13