Fix #648