Fix #959