closes #931, fix issue