Finally Fix #936