Fix #656