fix issue 245