Fix #663