Fix #647, but caused by 89791a0