fix issue 916