Should Fix #967