Fix #605